From e2f33787f0cfda6e7dfd19e2b0bceb2f3849126f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 16 Apr 2018 17:57:25 +0300 Subject: [PATCH] Remove `internal` from error handling --- src/cargo/util/paths.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cargo/util/paths.rs b/src/cargo/util/paths.rs index eb5ada5cb..350663620 100644 --- a/src/cargo/util/paths.rs +++ b/src/cargo/util/paths.rs @@ -8,8 +8,7 @@ use std::iter; use filetime::FileTime; -use util::{internal, CargoResult}; -use util::errors::{CargoError, CargoResultExt, Internal}; +use util::errors::{CargoError, CargoResult, CargoResultExt, Internal}; pub fn join_paths>(paths: &[T], env: &str) -> CargoResult { let err = match env::join_paths(paths.iter()) { @@ -154,13 +153,13 @@ pub fn append(path: &Path, contents: &[u8]) -> CargoResult<()> { f.write_all(contents)?; Ok(()) })() - .chain_err(|| internal(format!("failed to write `{}`", path.display())))?; + .chain_err(|| format!("failed to write `{}`", path.display()))?; Ok(()) } pub fn mtime(path: &Path) -> CargoResult { let meta = - fs::metadata(path).chain_err(|| internal(format!("failed to stat `{}`", path.display())))?; + fs::metadata(path).chain_err(|| format!("failed to stat `{}`", path.display()))?; Ok(FileTime::from_last_modification_time(&meta)) } -- 2.30.2